* emacs.c (standard_args): Removed options -i, -itype, --icon-type,

added -nb, --no-bitmap-icon.

* xfns.c (Fx_create_frame): Make bitmapIcon have default on.

diff --git a/src/ChangeLog b/src/ChangeLog
index d466f5d3bf27cf8ade89e8df4518f931cc170d1b..d9b2eb7ab3c315a65be551f89f39f166e6d97a34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * emacs.c (standard_args): Removed options -i, -itype, --icon-type, 
+       added -nb, --no-bitmap-icon.
+
+       * xfns.c (Fx_create_frame): Make bitmapIcon have default on.
+
 2005-10-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * macgui.h (MAX_CLIP_RECTS): New define.